merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 7 Jul 2011 05:12:06 +0000 (14:12 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 7 Jul 2011 05:12:06 +0000 (14:12 +0900)

Trivial merge